DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: Ic2755603affbe971a1872fb2fe5d39a0bee6e5c9